bitkeeper revision 1.1236.1.205 (424fd161S0p6f85LcRWpZCuo7kqBBg)

Fix tools build.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 68a5282701288fb3dc15b9752c24521e38903a34..e6171ad399f05e980c58234a508ef75f6bf5b1e4 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -23,3 +23,6 @@ endif
 
 %.o: %.c
        $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+%.o: %.cc
+       $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<

diff --git a/tools/ioemu/iodev/Makefile b/tools/ioemu/iodev/Makefile
index 20a7410961faf69ea95212a0767986b48e6b06b8..20803c0dc7b6ed0342899370ade38191c1bb20c6 100644 (file)
--- a/tools/ioemu/iodev/Makefile
+++ b/tools/ioemu/iodev/Makefile
@@ -10,7 +10,7 @@ LDLIBS= $(BXLIBS) $(X11_LDPATH) -lX11 -lXpm -lstdc++ -L../../../tools/libxc -L..
 all: device-model
 
 device-model: $(OBJS) $(BXLIBS)
-       $(LINK.o) $(OBJS) $(LOADLIBES) $(LDLIBS) -o $@
+       $(CC) $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LDLIBS) -o $@
 
 include $(TOPDIR)/mk/helix.mk